Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

erc1155 #165

Merged
merged 59 commits into from
Jan 21, 2025
Merged

erc1155 #165

merged 59 commits into from
Jan 21, 2025

Conversation

wolfy-nft
Copy link
Contributor

@wolfy-nft wolfy-nft commented Dec 18, 2024

Overview

  • ERC1155MagicDropMetadataCloneable: storage for contract metadata
  • ERC1155MagicDropCloneable: biz logic (public/allowlist stages), protocol fees, extends ERC1155MagicDropMetadataCloneable
  • ERC1155ConduitPreapprovedCloneable: provides immediate trading on the ME seaport conduit (no approval tx required)

Tests

19 new test cases added for ERC1155MagicDropCloneable
Screenshot 2024-12-18 at 1 08 44 PM

35 new tests added for ERC1155MagicDropMetadataCloneable
Screenshot 2024-12-18 at 1 10 04 PM

code coverage. both should be 100% but theres an lcov bug causing missing coverage on two lines
Screenshot 2024-12-18 at 1 10 53 PM

Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
…gicdrop into adam/feat/selfserve_1155

Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
…gicdrop into adam/feat/selfserve_1155

Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
@tenthirtyone
Copy link

#164 (comment) but for solady

Signed-off-by: Adam Wolf <wolfynft@gmail.com>
@wolfy-nft wolfy-nft closed this Jan 20, 2025
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
Signed-off-by: Adam Wolf <wolfynft@gmail.com>
@nothing0012 nothing0012 reopened this Jan 21, 2025
@nothing0012 nothing0012 merged commit 4167396 into me-foundation:main Jan 21, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants